Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Thu, 18 Oct 2012 18:19:55 +0000 (20:19 +0200)
committerEli Zaretskii <eliz@gnu.org>
Thu, 18 Oct 2012 18:19:55 +0000 (20:19 +0200)
commit19a47b490b420fdb4d4d8a0f5fcef6a2ae6e6848
tree406ff27082795934e5efd393c2a56f4f3d31c27a
parent491f50c9e591d78c3f9e7cf3539820c5011add3e
parente3b6d899c9da8b9db580eabab420d6e598f7e6aa
Merge from trunk.
lisp/ChangeLog
src/ChangeLog